Merge with xen-ia64-unstable.hg
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Tue, 22 May 2007 05:43:05 +0000 (06:43 +0100)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Tue, 22 May 2007 05:43:05 +0000 (06:43 +0100)

Trivial merge